Merge "Show big text on AoD" into oc-mr1-dev am: a4996f241f
am: c86252c1dc

Change-Id: I51d691cd2cec04cd9c0b979a87914e9b4cde49ce