Revert "Revert "Revert "Update 5.1/H-1-5, 5.1/H-1-6, and 5.1/H-1..." Revert submission 3219776-revert-3218295-revert-3196748-KQFTBOJSUO-XAYUFEYWJO Reason for revert: Droidmonitor created revert due to b/360167476. Reverted changes: /q/submissionid:3219776-revert-3218295-revert-3196748-KQFTBOJSUO-XAYUFEYWJO Change-Id: Id577042881128fbf224acf7d0acc802e5d67fa19