jf: update prop

Change-Id: I78b0a5ee8d7401fcc2f08c5e01bd863aabfe8781
Merge "jf: update prop" into cm-10.2
Merge remote-tracking branch 'remotes/cm/cm-10.2' into cm-10.2