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

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: Id704e68bb4fdd458a2f9068b8f8d12c1c63e8ae6