Reconcile with jb-mr0-release - do not merge

Change-Id: If17cb68d4590892767c5c9669b194c8c8cda68b6