Merge "Finalize @SystemApi annotation" am: 8de85f4b50 am: da086e20c0

Change-Id: I14206a0335665a8fea1cdc7ed33479ca4e7b38b2