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

Change-Id: I2de16bdb34536b18eb722420b9c7eeaeaef26920