Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-mr1-dev
am: b0a2af2643

Change-Id: I5396934ca314921521f384df5bf7aa5a5eb6458b