Build fix

Change-Id: Ifd4fad58b74aab174380e96f5e8d91cac50ddc1b
Clean up

Change-Id: I020fc14be94e9d442ad150e5d5c31087b897f09b
Merge remote-tracking branch 'github/jb43' into jellybean