Fix merge errors

Change-Id: I1cf6964cfc03af00c4a35bc92ca1eae19ac7c4f6
Signed-off-by: Evan Anderson <evan1124@gmail.com>