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

Change-Id: I4f94f72778be7dc2ed64e63892df4463e72e78e1