Merge changes from topic "am-3ea978f8-b5bd-4576-942e-470f3ebf9fbb" into oc-dev am: 86b04ebe1c am: a50684d1cb am: c98e550078
am: 6d002ee3d5

Change-Id: I9f0694c3d080dd11bb99040647960c66df203464