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

Change-Id: Id0cd5164aa3d404463c520c3361cce521f3577fe