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

Change-Id: I250ceb67df56babcc29acba826e7dbbea7d1fcf8