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

Change-Id: I12228df608aebe82af2aac17f181deafc1729d0e