Reconcile with jb-mr1-release - do not merge

Change-Id: Ia30ecedfb569952d5aa125673ea4a749ef7f0144