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

Change-Id: Ibbe777e000d41acd338e396199bb93e652b38d26