Merge "Only supports ambient mode when necessary." into qt-dev
am: 10a9fde8b5

Change-Id: Ibcefc33bd07d3f2d992f415c585b50681611e90b