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

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: I456d9868cfada42bc68ad2d1617924f5e8956423