Merge changes I15da2563,I7845542d into nyc-mr1-dev
am: 7b8b1aab93

Change-Id: I66d92cd3c08a67598cefdc6256825b1c6c1736f5