Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev
am: 4839fb4abd

Change-Id: I330f9c4e3732d4655e294d6ad2c1ab120ce10b10