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

* commit 'df5a1987108539c703477adff3749d647ba313c5':
  Limited AppCompat support