Merge "Remove dump_hals_for_release." am: 67ea994f26
am: 5aab29abe9

Change-Id: I08e5c380002ec3d3abab1783704df36e12298afd