Merge "Add missing includes." am: 81dd96c0da
am: 5436974d21

Change-Id: I65b5c9ca872c96e3475c7d22950a5664e8e273c1