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

Change-Id: I7beece22bd595475f333b9fce5675321ed7d29d1