[automerger skipped] Reconcile with jb-mr2-release - do not merge am: 02af5ba496 -s ours

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: I64336217b527eea81bf3bf9948309a66172e9486