Merge changes from topic 'am-736a6572a9704bdf94c4c8f32eb82316' into nougat-cts-dev
am: 43375564df

Change-Id: I8ab22856c545780923d6964dfe30a9561eeda7ca