AA: backport r36655 from trunk

git-svn-id: svn://svn.openwrt.org/openwrt@36715 3c298f89-4303-0410-b956-a3cf2f4a3e73