[automerger skipped] am d25b6b73: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge am: 013df9a0a7 -s ours

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: Ibd7f7e9173948e2fec1357efb978dcb05450503e