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

Change-Id: I7defe2b6c31187e0c90748bd8510058a99940aeb