hammerhead props android-4.4.2_r1 KOT49H

Conflicts: