More overhauling for CM9

Change-Id: I77d6924ee6a8d351387318d05d853d8262bae7b6