Merge "API 29: Clean up unintentionally published checkNotUsed / markUsed"
am: d97644fb4b

Change-Id: Ie185954203a5a4b4ae065380d97793cc2703e123