[automerger skipped] Merge changes from topic "am-b1abf59f1dd147ce9923691ecc3eba76" into oc-dev am: 1a2f39cf60 -s ours am: 7c227efdf4 -s ours am: 07477690f0 -s ours
am: fa45c0ce4c -s ours
am skip reason: change_id Iadc96b33bb11c0716fb9fedd158805b32cf1644f with SHA1 e85c43713f is in history

Change-Id: I80491efa7e618465ae4c23789740ba8444189ebf