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

Change-Id: I242df2bfe9436a6b16e952da318b67b212e54516