Merge "Update to new minui text API" am: 335502453d  -s ours am: b6a8454cd5
am: 11c19d9b15

Change-Id: I127c9ca62f59dff9c03d9e48a30649e7806e831c