Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am: c1dc8058 am: 812ec62a am: c3ff91a2 Change-Id: I69dc7a8329df67e668addcd07d288709230cf48e