Merging Dhacker and Hashcodes changes better commits :)

Change-Id: I135165ad63460c189884aa6fc72a1d24a5e2ad30