Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I9629362dd810549cdaad8633361e761b81fc9d5c