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

Change-Id: I131241cf918ac621f6728562a274607e936408f7