Merge "Add ability to skip function name resolution." am: 2733708cfb
am: d41821eade

Change-Id: Idb3e5e804df99e39281ed5c79c2ea3c747abce8f