Merge "Add the missing #include of <functional>." am: dd553d280f
am: 965021ab8d

Change-Id: I31d1c3bb2729886457d4f5a573af7cd13cec74d2