Squash commits

Change-Id: I992a94b6f0c7360242da6eb20478e2bd15d037d0