Merge changes I0fa30f93,I1577e934 into nyc-mr1-dev am: f10a1b8623
am: 64f64c53b7

Change-Id: I43f8ab042d22e7fbd8a09274fd212b8183434507