See ae2d5ba31412c4f382ef405000baa866f35dd736 and d0be7c8f9a06b3ca8ea7647ea35c8f9dc63f0fe1. Internal BUG 11590144 Change-Id: I76119cd20fdb205728482e682fd1206d1305881d
Change-Id: I1d18b1364c1aa90aebdc068eade6aa68e43f6f2f
Extracted from the tervigon build for android-3.1_r1 a.k.a. HMJ37 Change-Id: Idd914b3a4879174f98569b3a9bbb6cf3d48ef221