Merge changes from topic "am-3bd7761d-0a22-43c4-98aa-44bfc62874ad" into oc-dev
am: e17682a20c

Change-Id: Ifca9cd37a7d20404a2cd48fd2a09a1801d574037