Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev am: 3e2bfbd135
am: 3feff1367b

Change-Id: I776625bbc557c747477db70235847dd8b3ab8baf