Reorganize imports and make constants uppercase

Change-Id: Id9aa4b21b1f3ddf4db464c4c06d2b9ba3a581307
Merge "Reorganize imports and make constants uppercase"