Merge changes from topic "am-01dfab30-af7a-4b8d-97d8-55bde12588f9-nyc-dev" into oc-dev
am: 96e62bb999

Change-Id: I387591c99f211f3e2399eed316cc1eada3a6b7f5