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

Change-Id: I9178a0c5f3cba9ce186e55e4fe5d6f7782e71f7a