(cherry picked from commit a0deda1a777d8967fb8c08ac976543cda895773d) Change-Id: I935725ba094d2c35fdc91dd42883bf5b0d506d56