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

Change-Id: I730338a57ee3c73f77dc7951ae45d6ad4f6246ee