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

Change-Id: Ib4241786034334a11886ec4c37fbced94b8cb77e