Merge "Include what we use." am: 5fbe6e4212
am: 6fa46293c4

Change-Id: I76c4db1130fcb3da7c61fe10321bfb00a25be269