Change-Id: I18b8edc930b2efa0652f59c246931ad0d46827f3 (cherry picked from commit 34b82e6da0a471010cdae613ba39487889d79369)