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

Change-Id: I05c9309801d3e8b3d7768e35cffa3848c17437bd