Squashed updates from Andromadus

Change-Id: I9b88ec27e4a5aa41800baeeb1652141f7febed82