Merge changes I5b45f043,I1ebe7fc3 into nyc-mr1-dev am: 19ac71d042
am: 47cbc9ac6f

Change-Id: I53cf27c69dd0306cf925ca2d4af9b392404440c8