Merge changes I1d04a92e,I8d7596fa,If63c5434 into nyc-mr2-dev am: c687aa08c1
am: 5736b1689a  -s ours

Change-Id: I2be4e7e3f4b2830953e7f7b11994274c997f0b3e