Merge changes Id876f01f,If7c94cf8 into nyc-mr1-dev
am: 634ed6bc17

Change-Id: Ief5ce9cfa0ec8d221a221ef726e8b516e35db606