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

Change-Id: I428d9dcbe7008645e5dbf3a35946a6de34229299