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

Change-Id: I9771f6c14fca2768b7b455792f6f62a1855ac4ec