Merge changes Iea048eaa,I5c246571 into nyc-mr1-dev am: 72d1772eca
am: 340680891a

Change-Id: If71c96930270a5290e066c29477305686e3b1d2d