[automerger skipped] am 29dd8449: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge am: 5c0dd380d0 -s ours

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: I9c5077481945f8d7fcc034399d64676310206e55