Merge changes from topic "am-538bf8fd-0fa8-4c10-aeea-2cd19adfb09f" into oc-dev am: 65e0be10ae am: 624190b5cd
am: 96671ef544

Change-Id: I9bee40b7adce361dc70122b4c8ae2e334d2ef63f