Fix SystemApi annotation am: ce4f046fa9 am: c04a5b4009
am: 0965860f0d

Change-Id: Ibad1e22e7d992d2623ad8b914653cc156702d4f1