am c26a460f: am 2aaa82e4: (-s ours) am 89a2254a: Merge "Add missing include."

* commit 'c26a460f6c89de0bd0a65fb5378fd34af9e01490':