am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 7789447
automerge: 580937f

* commit '580937fc45bc5ef97e45f1eaf67945a07c5ce41f':
  Limited AppCompat support