Merge "Merge changes I1978ce3a,I79160004 into tm-dev am: 35640f94 am: d0cd381a" into tm-d1-dev-plus-aosp