Merge "Finalize @SystemApi annotation" am: 8de85f4b50

Change-Id: I33c752bd21ce66c95ef38530e3a28d48bb5d6946