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

Change-Id: I12e03896390996549ed7bb210df226b99d4de21d