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

Change-Id: I1e48c0ebc1fa1089336b3fbf2e4e28a195d6c050