Reconcile with jb-mr1-release - do not merge

Change-Id: I079f0dc7009858dc8ab8718802e81b29919aa0a8