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

Change-Id: I6ff76f0ab9636df3d20acc5d2c581adb5e509ce1