Merge changes from topic "am-99f96d4bf8bd428a9162864631bb5e5e" into oc-dev
am: f9c3fa42a9

Change-Id: Ie8ddca9c1a7ccec31706d7a06c514eb871aa4dcf