Merge "HIDD: Address API Review concerns" into pi-dev