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

Change-Id: I8a7b24f4baa451c71580496b84b36a731bb1c4c6