Merge changes from topic 'am-d93effc2c36944e2a5199ec02939cb56' into nyc-mr1-dev-plus...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 13 Sep 2016 17:12:48 +0000 (17:12 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 13 Sep 2016 17:12:48 +0000 (17:12 +0000)
* changes:
  Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f am: 636d5cdf56
  DO NOT MERGE Allow old behavior in image format property tests am: 0825a289c0  -s ours am: 29574ad7e7 am: abbf2e05e4
  CP: Fix required sample count tests am: f6a815214a am: dd22d24f36 am: aa4fda92b6


Trivial merge