Improved imports and namespaces parts.

Change-Id: I480fbb6acfe9069df44a37c11f956e3c6d52a699