Reconcile with jb-mr1.1-release - do not merge

Change-Id: Iad0c1acc5bc938d9fb65b64119152daee5a71a1c