CP: Fix required sample count tests am: f6a815214a am: b738653968 am: a156cab09b...
authorNanley Chery <nanley.g.chery@intel.com>
Tue, 22 Aug 2017 18:21:51 +0000 (18:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:21:51 +0000 (18:21 +0000)
am: 9aa4cb53bc

Change-Id: If8fe934f18dc2e4ab171518252bba9e67e5871f7


Trivial merge