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

Change-Id: Ic819b7b29be85ccb82ec1f3303040d7740fbeef9