am 710d192e: am 5cca407d: Merge "Fix message starring via overflow" into ub-gmail-ur14-dev

* commit '710d192ef87bd0fd76df14dacd226057a46397d0':
  Fix message starring via overflow