Merge "Remove System APIs not required for R" am: f5f137b9d3

Change-Id: I02925dc4f4810032a7381832187c420253227664