Merge "Merge "Clean up APIs before declaring API 28." into pi-dev am: fb10508cfa am: b129fadef8"