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

Change-Id: Ief25c7aea75b2548938c669ca239d5178039a3f2