Merge "Merge changes Ife2ffbed,I3bd8b266 into nyc-dev am: 3a1d9d5f06 am: 00f09fa40d" into nyc-mr1-dev-plus-aosp