CP: Fix required sample count tests am: f6a815214a am: dd22d24f36 am: aa4fda92b6
authorNanley Chery <nanley.g.chery@intel.com>
Tue, 13 Sep 2016 18:05:27 +0000 (18:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:05:27 +0000 (18:05 +0000)
am: d6927f8d8b

Change-Id: Ibb6921f6a02293e6b53361bbbaea4a788c534e08


Trivial merge