Reconcile with jb-mr1.1-release - do not merge

Change-Id: I37667f21ee86fe7aafbf7f44573b27d7eb573f7e