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

Change-Id: I0acbda83058a24ab2fdb9fcfb3a156838bc063a6