Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into oc-dev am: 827eb741 am: 03c97d0a am: f75de43e Change-Id: Ia101af66bfc163a4476e43c2e801f0147c0d5d6e