am 022cf57f: am a08934cf: am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev
automerge: c63efbd

* commit 'c63efbd928cc14e32fe19b2dec41d15ffc584182':
  Avoid static initialization of Layout from TextUtils