Merge "Ensure Contrast: Address API feedback" into qt-dev am: 2631fb58b6
am: 0ab3251b57

Change-Id: I98492f636ba4f08a59b72a4ba8754082ac4850f5