Merge "Add new SystemApi methods for mainline"
am: f363f3549e

Change-Id: I463ca5c1745b236e5771808e70d77edd744a3714