Squashed reconcile w/ cm

Change-Id: I7d21c7604d0753a5ec744092d10452ac404ab436