DO NOT MERGE. Fix build

Change-Id: I9b15e609b2c75bdbccaa5f063a5ec8ca738bd2f9
2 files changed