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

Change-Id: If75fe6d573d44ddb6ef0e562688bea88654717b3