Merge "[BR12] Use sdk level instead of aconfig flag" into main