Merge "Rename options for shorter names." am: bc58b020c8 am: b4bfd7f529
am: 1db8c382e9

* commit '1db8c382e9ef69cbd80b7f538fb667fbc1d9d648':