Merge changes from topic "am-9fed7762-1c53-4647-9bc3-1e1194c37b76" into oc-dev am: 8f8aaca8db am: 81958a26d9 am: e6d3072838
am: 38ebcd2e47

Change-Id: Ifdc3af64caf6da97ae950764a82dcf540790cbfb