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

Change-Id: I7dc6218e1103d9bbf789d66a70d344cb4b43c0fc