hammerhead: fixups

Change-Id: Ie2ad3fc6082ff9ba8f9981707f3d8e4aeb2bf531
Merge "hammerhead: fixups" into android-4.4