Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into oc-dev am: 827eb741d7
am: 03c97d0a92

Change-Id: I80025b0036a7d9b5a77e3807bff44ef22aa898d2