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