cancro: revert few aosp l changes