Merge "Restricted Context layout font loading in TextView" into oc-dev
am: 7f90a9fdb0

Change-Id: I32a8e9e627e0b78b22c87b11483e744486e16944