Merge "Add missing includes." am: 0c24d6ccea
am: d166904f30

Change-Id: I0b87b789f2f07e83dd3b39fee3f09dfeb03115ce