Change-Id: If7517f49307a1e27b1d4053bd49ccdb07ffb758e (cherry picked from commit caa15d49f968720f51a096b93e0412e97db269a1)