Fixing my bad merges

Change-Id: Ifd1a12945462867604146a2a8432e65e806f60f9