Merge "Add missing includes." am: 3f822c189e am: 514502fb98
am: c7ca3b5abc

Change-Id: I6b6fd1841c1f7822ebf2cf38c2dfcfb7f4cd08ab