DO NOT MERGE Fix a few remaining compilation issues

Change-Id: I613b2a2031cbef6c72f88493082672f58f02d0a3
2 files changed