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

Change-Id: I97dbaaf6eabde1fb7947b76e4aac7090c34f3280