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

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: Icdcb1164313506c73c4a2cec349bf94675d10f59