Merge changes I03844bce,I8035357c,Ibe7cb6df into nyc-mr1-dev
am: 1340221244

Change-Id: I18d7d3168af5adfdc59cbb7f4a51d43337eb366b