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

* commit '5b3bd8c6aba81bf36972a610fdf176adf00ebce3':

Change-Id: I578c34838f91d57b2a798bced3861cdd1ec43e32