Merge "consumerir HAL uses "default" service name" am: 563665bc1f am: 5b5e501526 am: 3096f94546
am: 3d8aa56da9  -s ours

Change-Id: I567705c2e9309dd5301d0e841d95a44623f73315