Reconcile with jb-mr0-release - do not merge

Change-Id: Ia08d24491caba9dc02d8e09af5fd00e33daab33c