Reconcile with jb-mr1-release - do not merge

Change-Id: Iaf9173c88979b8cb2a62bc6d81be60886bbbfd80