Merge "consumerir HAL uses "default" service name" am: 563665bc1f am: 5b5e501526
am: 3096f94546

Change-Id: Id730f4d4be676e8ced2d3afc5201a135dc0cb7f3