ref: f3739f905226bfaa8e0e1eb7ce16b1adc86f3895
parent: 07dddfa3fdf11c08c8b91b96fe94907be228f2cc
author: Dmitry Kovalev <dkovalev@google.com>
date: Mon Apr 14 10:09:39 EDT 2014
Consistent mode names. Change-Id: Icb4851d98c951506fe5d73d8d5a8ac7e53fecfd0