Merge "Merge "Add white edgelights to AOSP" into qt-dev am: 0bcd6984 am: 67302596" into qt-r1-dev-plus-aosp am: b6bafcd4 Change-Id: I91cc43d2db2d8a50f2c812298f40b7f007b5b596