[automerger] Merge changes from topic "am-e98b014a-64b0-43a4-a8eb-a11085ff1032" into oc-dev am: 9e0c12dfd0 am: e2520f1baf
am: 3a0d30166e

Change-Id: Ifc1795cc34420cde6ccf43064f3f82a83120ba17