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

Change-Id: I88e6cf7ec1cc93a219e8227ad59aef4175ca64aa