Merge changes from topic "am-06853e6c108343be9f3dae60afe35875" into oc-dev
am: dfa865bf3c

Change-Id: Ifa6b5687969670bf3b5b119e840d836c54b98bdf