Merge \\\"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\\\" am: f388075f8f am: a153a22f80
am: 48e5206081

Change-Id: Id33bfdd2b7e68dace00ffb2b22731b6d31a61659