[automerger] Merge "Merge changes I6d8ecdfc,Iff0b0c7e into nougat-cts-dev am: 315a0f0150" into nougat-mr1-cts-dev am: 4cc95d60cb am: 8d837b4a0c am: 255bd3f917 am: 20720e01b4
am: 316be7c12e

Change-Id: I967f4223d0b875d4bed8c6c2ab8ad3fa56942d91