Reconcile with jb-mr2-release - do not merge

Change-Id: I4d242b2cbadf2c9bcdeeff721a83528cd02b3c0e