Sync with AOSX device tree #2