Merge "A few cleanups."
am: 0c22c5646e

Change-Id: I557f9348d53d6c64efba4e25c7fa46970ca5e7a0