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

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: I476ec54f852e69a622c923418e3274dda7cbf945