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

Change-Id: Icc0ceb178cb24c443b040e704f5a7c379555b220