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

Change-Id: Ibcdc31fcb01a583ca05c056b2063f77c0f4dbeb6