unbreak the build,

plus some followon patches from Id3b0a074

Change-Id: I9f667a8d68a68d90c0d7f2fed3f28efcc6720533
2 files changed