Merge "Preparing to finalize @SystemApi"
am: 9f85cd1bdb

Change-Id: If7fa9a90b3ca60ee75d767e9196804f692bb802a