Merge changes from topic "am-4c299d62-09ab-4948-bcda-e53d47ce6ee3" into oc-dev
am: 82eaf5569b

Change-Id: I785b44f42aea4a2c816bf41318ac14a74edf894e