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

Change-Id: I9b8414b89138651f3b3132789cae59ad6780dbb6