Change-Id: I0360d468d54d970c87f313e24e50965245206f28 (cherry picked from commit c502744f2ddcc80a34f5197b5d2c0d701c7d6e71)