o added some minor header include changes o related-to-bug: 6044887 Change-Id: Ia8e7ba861c509a4fb688ab2ed1e81151a708861a
o related-to-bug: 6044894 Change-Id: Ib8f5406e32bd6c190d65e4a2e014f73e759d4415