Merge changes from topic "am-508b07446db046c4876e06219e1ca4b0" into nougat-mr1-cts-dev
am: a05256405e

Change-Id: Iefe6ad8b44719f1da2698039d2f3b0ac94dffd1b