am 3636471d: am 334a05a2: Clean up code in preparation for AOSP.

* commit '3636471deb513368ef51bea7910702e77eddf3eb':
  Clean up code in preparation for AOSP.