Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev am: d59b0eddae
am: 3f2dbb7cc9

Change-Id: Ica684d7a7fc36439111b7eeb3886761f63a7130f