Merge changes from topic "function-pointer-diffs"
am: 1df3f2d21a

Change-Id: Ieb10749dea66d75772a0174751467b8aab623522