Merge "Remove dependency on internal libcore method" am: c7ae7ca343 am: 953b53c2e6
am: 3cba119cc4

Change-Id: I0a025d5ad52162ac4002a73e9894128658844853