Merge "Lighten SBNs" into qt-dev-plus-aosp
am: 7f59304a51

Change-Id: I570e72bb605405df4e5e0df95855f4a7003654bd