Merge changes I40f73526,Ia08900c5 into nyc-mr1-dev am: d6feb60383 am: f3fb0bdeaa
am: 4096ae12ec

Change-Id: I901484f6767be07b138c3cc71c00113dff3d1cf2