Merge changes from topic "am-6226f04e-8ff2-465c-87df-491a230a31d6" into oc-dev
am: a960379ec4

Change-Id: Ic889fe5cd4283997465b5899469961a5fa9a602b