[automerger skipped] am 7d0a85e2: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge am: b91b601f3e -s ours

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: Ic1e3d2efca847eb1b47ea4c9fa894e7a2dab3893