[automerger skipped] Merge changes I2fd474af,I0b32b559,I53d46376 into oc-dev am: a584197e92 am: 2db8c42a6a -s ours am: 264566da27 -s ours am: 9d8815fde0 -s ours am: ae2c270e18 -s ours am: f53add3246 -s ours

am skip reason: Change-Id I2fd474af1659a319cef864bad44d3b0bc2ee8724 with SHA-1 d0b985e74e is in history

Change-Id: I34002462f3c07d8952f7d3e36116ca8fa51d4ec0