Bug #10206452 Change-Id: I928c9189b0d80741490b01a739959d8c2d5312a7 (cherry picked from commit a2cdb59b186d0ee51f110c1a7d358911573d48bf)