Merge "Avoid use of FQName globals." am: 2d24003b22

Change-Id: I4b2a5f4d74eda2468ad69c467e9dfedb69b08f31