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

Change-Id: I74b8fc6cdc0d1a4b7d778bcb29c91cddd997d12c