Change-Id: I721471737eca1e2d59ffae05a2a7df399bec9e9d (cherry picked from commit b1001961e9b5a985e1a6ebcc1e5e2ca828ea991a)