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

Change-Id: I58d43d04ebc3830a9e270d1bee696d6691cf3a08