Merge branch 'stable-2.12' into stable-2.13 * stable-2.12: Handle when uploader email matches more than one account Change-Id: I46341cc90ff3bcbb6ed684d99705812cdef87ecd