Merge commit '8ab456b3fcb7e81af824a69daee31921d531696b' * commit '8ab456b3fcb7e81af824a69daee31921d531696b': Add separate configuration flag for hardware ALS support.
Merge commit '8ab456b3fcb7e81af824a69daee31921d531696b' * commit '8ab456b3fcb7e81af824a69daee31921d531696b': Add separate configuration flag for hardware ALS support.