am eea5a9e0: Merge "DO NOT MERGE - Minor clean up: redundant functionality in...
am eea5a9e0: Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView." into mnc-dev
* commit 'eea5a9e0':
DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView.