ref: 77c754df795838395a82d8660b1ad01ce84e15b3
parent: 817ac44aa28cdbe8d2c98c753f3066605df8a873
parent: d22faee98d20430e7db9d8e1a28963d4f348ee47
author: Yaowu Xu <yaowu@google.com>
date: Mon May 12 07:05:54 EDT 2014
Merge "Cleanup unused parameters"