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