Cleanup: Use framework-provided method.

Change-Id: I1b62d65b0a142f64b86a475845316c5042dfc7b1
Merge "Cleanup: Use framework-provided method." into cm-10.1
merge changes from remotes/github/cm-10.1 into master