Merge changes from topics "hearing-aid-white-list", "hearing-aid" into pi-dev
am: 891ca8c830

Change-Id: Ie3671401583fff7528eff61796320140c136d69c