Merge "Tests for libcore change d2aa1365d25911076cb174a04b1d5152f0ff80e3"