Merge "Clean up some global variables in common.h" am: 80c405f692 am: 168ce56022 am: 6f8e0ede72
am: 984dc5c263

Change-Id: I5df6ce9f82a0535c844b9474dbe57dc4e6e9e316