Merge "Add missing #include."
am: f3df0dae0b

Change-Id: Ib81b8ae98cd64f10bf7400db14951cffdbbdc8c1