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

Change-Id: Id8457b55a6ba9bb837128110efd5ca1bfde2b825