Change-Id: I34ac37b94f9f24506a1b0fad9aafa7930767a486 (cherry picked from commit 2e79d4e122d02d52d06aa2cda517c1357d021c74)