Merge fixes

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