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

Change-Id: I7bc150fa572bc9709263feefcd12f786f4393d15