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

Change-Id: I19327405fc5eb081741a140637b531b265683ce7