Bug: 11466297 (cherry picked from commit e92f19e5) Change-Id: I449474078b9f465f1da26a27bf96f9c35d2bb2fc