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

Change-Id: I3c129508f1f81c7580b4b2b8a37d4f04f62d55c1


Trivial merge