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

Change-Id: I3792100af3d64b1ee520b0403ddfdb5198dee346