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

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: Ia408e33bff21dd667114c26d6bf1ae0bce3b14c2