Merge "Merge changes If7b8ed3f,I309c3825,Iafd06419,I59f73caf into nyc-dev am: bd1708a19d am: 4f60ba2480" into nyc-mr1-dev-plus-aosp