Merge "Remove common.h" am: 899f7b5105 am: 03fd851f61 am: 9387e5cd61
am: 9f1625a115

Change-Id: I49abe7e4b856e8acca573b6c510884f5f9092d64