Reconcile with jb-mr1-release - do not merge

Change-Id: I23eff659df50eda339492319a1d92c11558f34a4