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

Change-Id: I25c9c8bb255477508948a9a862088a8fda344d5f