Code cleanup.

Avoid repetetive boilerplate code by using helper methods.

Change-Id: Id3ce8d07d35d59c08cbc67fa35bbf6daa67c9608
Merge "Code cleanup." into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into HEAD