[automerger skipped] Merge changes I44108877,I25c6b325,Ib223620d into oc-dev am: 846a21dd61 am: 0d625205b6 -s ours am: 468b82f432 -s ours am: 13ff0594ab -s ours

am skip reason: Change-Id I44108877282b43358a5d01fe649ecc3870bedcf6 with SHA-1 cd05400e1c is in history

Change-Id: I3e307c0a742e21792813a2f1be2e7140bd800e95