[automerger skipped] GUP: Fixed some typos and update some values am: d0bbbfeeea
am: e506f9d7f5
-s ours
am:536542927e
-s ours am skip reason: change_id I7b1e42cd3a823a72bcd6d61b26c4954c237ff6d0 with SHA15735199641
is in history Change-Id: I63fb2c2acf5aa417b2acd1c251fdf8ed0844f583
This commit is contained in: