Merge changes I65784f35,Ib6937335 into nyc-mr1-dev am: 74f7f2ec0d
am: e80e63331d

Change-Id: I5cdfe7e952ceb9da89f775f4cd451cc26ed52401