Merge "Lighten SBNs" into qt-dev-plus-aosp