[automerger skipped] Merge changes from topic "am-c709fe3e-1c07-4ecd-9998-2477e3445dd4" into oc-dev am: d5e6e1e83e  -s ours am: e82c4b82cc  -s ours
am: 55ff3c76c5  -s ours

Change-Id: Ib2c05b9de6ab2984ea3dcc86e8b6eae9a4e95f83