Merge changes I4a7b64dc,Ic7df8d38 into nyc-mr1-dev
am: 02965424b7

Change-Id: I0022344cbb786b994f83c8d2547ff4070be7385d