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

Change-Id: I46c5b91eef4f2fbf03929d2eb92d37cd10f6377c