Add AOSP version
(cherry picked from commit 963cb165c77d3c084e0e11812187c336898f660c)
Add AOSP version 2