(cherry picked from commit baeb7668e20e4513fd6d7e6e211555a3c17195b8) Change-Id: I2a6f49d364aa4fac11ec950bf7fc88ecff7afdbb