[automerger skipped] Merge changes from topic "am-eb7e5809-a8f1-4883-95d8-8a81d24349c2" into oc-dev am: 86cd0cefbb  -s ours am: 66795bb553  -s ours
am: 47b9687981  -s ours

Change-Id: I9ac1e5b3612402e3ea7b35c8e0ad6881ef0e1bac