Change-Id: I241fa8701b6f1dbcad87fd2e9a429e32e7aa40f5 (cherry picked from commit b3ac8869338faeabedbc27e95e3166c830a9a761)