Merge changes from topic "am-2e7b32c3-6d04-46ba-bfdc-309eff7d76b0" into oc-dev am: d349bd741d
am: cf751f2189

Change-Id: Iddbea79cb8031d5c0eb5933a1b11902dde12c606