Merge "Add test for fq reference to local type." am: d8d0ba281f
am: 3c8833d79f

Change-Id: I5628c5b1d8ea9e01b492a48ecaf8fe1861aaf8fb