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

Change-Id: I66b8c90c6879cd93d71762eee114a8d9e8228afb