am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev

* commit '3d5535cfb7755c20619529649b025c4682013b85':
  Limited AppCompat support