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

Change-Id: I3ef4502fb9c54a8bbe08626bd39dd13733027bd1