Fix merge error

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