Merge "HIDD: Address API Review concerns" am: 8085d6f247 am: 6c64e83577
am: 153592fa3c

Change-Id: Idbb7a31a9de8092e91743c3806d6a0dba509eec6