Fix merge

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