ref: b6a0ac11f0082981d9f1edcf93cfcfe9e3ed0b13
parent: 17b2d63196c5f3f7c7e5a44a31517bb3a3605bfe
parent: 09faf559164616e2ff6263e68ea5a033be5a2000
author: Yunqing Wang <yunqingwang@google.com>
date: Fri Dec 20 03:46:11 EST 2013
Merge "Code clean up"