Merge "Unsupported app usage API cleanup"