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

Change-Id: I03366d18d53032dd228aa487ec97aa4eb2a79177