Merge "Merge "Only supports ambient mode when necessary." into qt-dev am: 10a9fde8b5 am: 6293cba478" into qt-r1-dev-plus-aosp am: cdf9c28caa
am: 4e7f5664c1

Change-Id: I2fbc661a364689c9c63d7d0291074ba277a309e3