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

Change-Id: I795b47e1c7e2c944c0c7525bb108af577546ee53