This merges several small changes that were made in response to comments that arose when LMP changes were merged into the Widevine repository's master branch. Change-Id: Ifec968af54dbc3288f24654ec0c6ca9b5962e1aa