jf: don't use vague names.

Change-Id: Ib43a5aa9bfa4495319137738d150b37731d4d93c
Merge "jf: don't use vague names." into cm-10.2