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

* commit '2d52390ac96678986288183d7f5ae7a18cee2131':

Change-Id: Ibd20725901cb7d143cb249f0f4d68ecd0f7d17ff