Reconcile with jb-mr1-release - do not merge

Change-Id: I17d2fef9d303c34015d889816c369a2e5899e65d