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

Change-Id: I1d7f0e0f6a4cb8b9363c99a830dc1656424ad49d