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

Change-Id: Ie4a7e41d8d28b46966f6aadfd38af5516c082f04