Merge changes from topic "hearing-aid" into pi-dev
am: 9c3f60d2f9

Change-Id: Ie7580ef3e0a74011a274707f57d7cf0d0fa0ab3e