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

Change-Id: I4979710d1215c2fb11fd8234089d00ca37f4b56d