Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev
am: bd9caf4c6f

Change-Id: I04decd84fba3ec690b6d77d2880b14245810b4fd