[automerger skipped] Merge changes from topic "am-0f30ee3d-94a0-4dc3-bb14-762781265ad9" into oc-dev am: fc28b6b7  -s ours am: e88da3d6  -s ours
am: ffec86ff  -s ours

Change-Id: Idf8692b0d521c7c7082bd242318a3e1c3d8c5ceb