Merge changes from topic "am-846a1af2-80b3-4a87-a3be-bf1f86677132" into oc-dev am: 4841fbc024
am: 59b390f28d

Change-Id: Ibca6a688a79b13b7e5d9ba558a5d14c73dd12c68