Reconcile with jb-mr0-release - do not merge

Change-Id: Ia62ca8b048a34639d11f7838b03c74420b3b3868