Merge "Merge changes Ie3033144,Ib4008117 into nyc-dev am: 6fae62de61 am: 83afcd2072" into nyc-mr1-dev-plus-aosp