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

Change-Id: I4ec0a42f3e59ad0bc4d26ca2b1132ec55ce6fa6d