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

* commit 'ea344529c72df8be538faaf419f96f3d7402e89a':

Change-Id: I3de99145ad3d9864a1552cded20ed373389327b0