Minor type changes/Fix contrast

Bug: 61411
Change-Id: Ia33b94f69c3cf655a278311801f64d32841af2e7
Merge "Minor type changes/Fix contrast"