Due to merges happening out-of-order, some formatting fixes that had previously been merged from the Widevine repository were subsequently wiped out by later merges. Change-Id: I9f02d281d276b0f5b5f93b02a699144400db7520