Reconcile with jb-mr1-release - do not merge

Change-Id: I6ad917dd332cd6677d124b08197e1686e66e0fca