CP: Fix required sample count tests am: f6a815214a am: dd22d24f36 am: 8b3a1c98ee...
authorNanley Chery <nanley.g.chery@intel.com>
Tue, 13 Sep 2016 17:11:58 +0000 (17:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:11:58 +0000 (17:11 +0000)
am: 420d8d6542

Change-Id: I1f8b0b383e9139c96cd0505805a7bdf555567312


Trivial merge