Reconcile with jb-mr1-release - do not merge

Change-Id: I8ceb7a33ab427c2d3e884e8b71064ecbc531fd1e