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

Change-Id: I15fcbdd3d1ecf41e306e6f83f432ebd7828620d7