pulling critical changes from aospal