Reconcile some things.

Change-Id: Ia5a9d007014401283fc1d181b9dcbee356320d34