Fix merge error

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