Merge changes from topic "am-7fb27bea-2be9-4741-8b5c-fc4520164a51" into oc-dev am: 77237d809f am: 5f6a8850fc
am: f4ed87f173

Change-Id: I653194afeab22ace0a800ecee31fdbe7ed0202a0