Reconcile with jb-mr1-release

Change-Id: I8a58307dd78dc6fa26d197408853e4f717b5bae9