Common module (with exceptions)

Change-Id: I9ec8dc19a5419dc315bc966469e6f1952af87df9