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

Change-Id: I54edcdc83a3f7cfc074175d11866e45df16b3fca