Merge from Widevine repo of http://go/wvgerrit/24723 Several review comments were uncovered in the merge from oc-dev to master. This CL addresses them. This is just style changes in test code. http://go/wvgerrit/24318 http://go/wvgerrit/24301 http://go/wvgerrit/24316 Test: ran unit tests. b/36451451 Change-Id: I257f8bf9b4fb5797e3da69578b48cd040cf61bfb