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

Change-Id: Iecaf65d45151f6c084ea33e8180dc27781d97cf8