Merge "Merge changes Idf64b96b,Ie717089d into nyc-dev am: c52269542a  -s ours" into nyc-dev-plus-aosp