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

Change-Id: Icd2030678228e137e2616e2d64847abf4f5a2242