am 75a38d88: Merge "Compose GAR changes" into ub-gmail-ur14-dev

* commit '75a38d88154fab2e96dfd1650720cf468409c57c':
  Compose GAR changes