Merge changes from topic "am-7b9b57bd-d6e0-4db4-8b44-08b16768f93f" into oc-dev am: a4eba4957c am: a017b6bc9c
am: fa8f4ae5ae

Change-Id: I40da2cc8dd372bda6b222be1f764d123b75f0053