Reconcile with jb-mr1-release - do not merge

Change-Id: Ia33edf3e502ec25303cc0dae104c955cd5cfa3fe