[automerger] Merge changes I6d8ecdfc,Iff0b0c7e into nougat-cts-dev am: 315a0f0150 am: 0bca1fd4cf am: 7ed8217ee9 am: 2f85480c40 am: 81bf19ebb1 am: 2206fc634e
am: df31aa34e9

Change-Id: Ib2ed6ef04ea93790da56f8f5c763a7092c9c49ce