am b530834e: Merge "Fix AppCompatTextView not using the default style" into lmp-mr1-ub-dev

* commit 'b530834efc68655d32fa37808e0251edb4f183ae':
  Fix AppCompatTextView not using the default style