Change-Id: I4b1ce980514ecc0b77a229c9dcb878dac9db8079 (cherry picked from commit f292a9fccd572eb3231ce05cef54ef8a17e54307)