revert cancro: updates from aosp l(2/2)