Merge changes I212a8bc2,I476b6586 into nougat-cts-dev
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 16:43:20 +0000 (16:43 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 13 Sep 2016 16:43:20 +0000 (16:43 +0000)
* changes:
  DO NOT MERGE Allow old behavior in image format property tests
  CP: Fix required sample count tests


Trivial merge