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

Change-Id: I84bdec1d34541c08fa2631e0c23ea2b28a6b5a00