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

Change-Id: Ia2aa69b0853d05dddea04c2970631c114793094e