merge in patches from aospa-pico