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

Change-Id: I2dca58c851e98b36bb0d7e146562ba21a9a66e1e