Reconcile with jb-mr1-release - do not merge

Change-Id: Ia9cde557f8e6abaf0935e6b238eb956be09c12ca