Reconcile with jb-mr0-release - do not merge

Change-Id: I7938397194acf1a0eae65c5a07d84a015e94ae13