Reconcile with jb-mr1-release - do not merge

Change-Id: I7cf4e6ee7be79954ccb3f4927d940c14fe7450f0