hijack: backport bugfixes from motorola/ghost

Change-Id: Ib07127724c5c3697bc7c088beff73f293e2d183b