Merge changes I546d7abc,I32163278 into nyc-mr2-dev
am: df37f1fa74

Change-Id: I082c8d392bd693ec0cad019c24bc03829dd6bad0