Merge changes from topic "am-9b4b0f8c-4823-4712-936a-f4aafe519eff" into oc-dev
am: 13ac18d299

Change-Id: I1e5b02cb9baad310f20bace33ce89c9668fbb3c0