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

Change-Id: Id0d9eb3205906b409e735546b988f43a3bdcc0ae