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

Change-Id: Ie1b6c70bf9080fbea066bfa80ba6d1908cff638e