Sqaush more

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

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