[automerger skipped] Merge changes from topic "hearing-aid" into pi-dev am: 9c3f60d2f9
am: ad7bbf12f5  -s ours

Change-Id: Ibfdf2816ddb497a297791aaa99563a8572da3405