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

Change-Id: I9b1c6f159abb2f1ac2d0696059a6e5a15278d8d1