Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into oc-dev
am: 6e30a00c96

Change-Id: I70114bdaa8186e7a2bb23e7d4e2c33c5d5b17e60