Merge changes Id60fd5ee,I4c7b68ad into nyc-mr1-dev am: 4a051a849d am: 2ecab544a0
am: 77ee9f0cdc

Change-Id: I1996b71411de20cf5b6218e28ba299136778235f