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

Change-Id: Ia91a80322aee49ad415c2aa39df6bf419633c10e