Merge changes from topics "am-2eba05d6-d1d4-4cce-a7ef-ae4a8f1b162b", "am-b31e8c10-9a32-4ecc-b69e-43a3623312ae" into oc-dev am: b36777de25 am: af79f58a79
am: 780279ef34

Change-Id: I052ba54d8461510dde02972c1ba779b62b8f44ce