Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492c am: 851e8267 am: e2a7c24f Change-Id: Ie4e2d6c9fe04adc0d26dc2d7a4d9e7c8ef89fb74