[automerger skipped] Merge changes from topic "hearing-aid" into pi-dev am: f9658e13bb
am: 8b05337e6a  -s ours

Change-Id: I87aff99bdb01b20cee9ff877edecbec3077aa5c4