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

Change-Id: Iad619b9585fd3e0859e3588cc5d6dbb604f763e7