Merge changes from topic "am-641f3aa3-ebd9-46aa-8f39-1f4ec4f86eb3" into oc-dev am: 7af053390a
am: 21cd2569bf

Change-Id: If444013b7d35152ca49ccc20a89841b1e5582c62