[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e

Change-Id: If5d1bb2ea504d9ca25a661e49eeb68274e02735c