ref: 4cda7a1a9ac73a0c2d313af81e87919080ffe939
parent: fb3cc0ed57785df406f0dda97d03d6b75834e215
parent: 4bacaab46daa6e5c2aa90c7dab6eaf103d01efe3
author: Jingning Han <jingning@google.com>
date: Wed Dec 10 04:05:34 EST 2014
Merge "Cosmetic naming change"