Change-Id: I286ad96d34b993e0931df09cace0ad5eb58f2413 (cherry picked from commit 8f2ae3099518bd812e1e9101c20dc662cc871e90)