Change-Id: I73c97626d12ae14c6650a758001254d013771358 (cherry picked from commit 46affb67f5d7e57850b38e8e2e89cc4c07db1e49)