CP: Fix required sample count tests am: f6a815214a
authorNanley Chery <nanley.g.chery@intel.com>
Tue, 13 Sep 2016 19:04:33 +0000 (19:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:04:33 +0000 (19:04 +0000)
am: b738653968

Change-Id: I56546a9ab91eadfcfb6a1e39704652c84376cd7e


Trivial merge