Reconcile with jb-mr1-release - do not merge

Change-Id: Id59555adc024005fc53103e2006e987e72283811