Merge "API Review: Clarify deprecated docs and rethrow from system server"