Cleanups around cpi->common.

Change-Id: I0c42a729038d0f4cb7bc07f587d066fcb1dfe9d9
1 file changed