Merge "Text color of "shutdown" after removing overlay" into oc-dr1-dev am: c1edefc059
am: 1244549858

Change-Id: Idb22b9d8e26a7bd73edcedf043fb7a06c16ff64b