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

Change-Id: Ica61e08e1461e86b3d90d7d07637d1981939605b