[automerger skipped] GUP: Fixed some typos and update some values am: d0bbbfee
am: e506f9d7 -s ours
am skip reason: change_id I7b1e42cd3a823a72bcd6d61b26c4954c237ff6d0 with SHA1 57351996 is in history
Change-Id: I0642e07bed6da847b16738f7e14f7aec2cb0632a