Merge "Hearing Aid Service Stub" am: 81166b5bd3
am: 68305bbdff

Change-Id: I37c9d6847bf0f62f2eadafc05193839ab61ae9dc