Merge "Remove common.h" am: 899f7b5105
am: 03fd851f61

Change-Id: I810c6fb8a57b9ce3283d15f10d29cb0848a200c5