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

Change-Id: I57da401f40ef864814935e143d0c5406ab5b6558