bug 17765171 Change-Id: I6cb244f221397656f7ef61e85d8a57bd7cda2abc (cherry picked from commit 452039d4)