Change-Id: I7db398aa2d11dac1210e84922138f78f0c23bb9b (cherry picked from commit a9090705efcc44f015486944e5aeb926173a7968)