Reconcile with jb-mr1-release - do not merge

Change-Id: I5416bcc9b3d1938de47da225b17ec075c724541b