(cherry picked from commit cb35803b) Bug: 10676015 Change-Id: I2bdb74c0761080f7545edc1ea63302090ff0afdb