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

Change-Id: I735c4ab87f233912c203cac0f008ec115b9b1103