Merge changes Id60fd5ee,I4c7b68ad into nyc-mr1-dev
am: 4a051a849d

Change-Id: If80619af61024fbd51ac5ccfd4fec7f20a4f24b2