Merge "Remove patchoat."
am: 9ec8559bc2

Change-Id: If94d17dbca95d9e9f728ecadc38ef55eadceab3a