Merge changes I8ca2871c,Ia633a159 into nyc-mr1-dev am: f66508ada9
am: 20b618ccb0

Change-Id: Ia6283edc141ab4382e16cfd247fc9b66503b3165