Reconcile with jb-mr1-release - do not merge

Change-Id: I459a44bdaaff7aebadd1db41260960bba3e3a402