Merge "Replace usage of "vector<>" with "std::vector<>"" am: f611c0457d am: ca5a332391
am: e4d6dcb8c5

Change-Id: If1529cbbc21d654027c08e4d88aadefd582a9f48