Change-Id: I93df3bcf8834939a84668ea6f904e961922425b4 (cherry picked from commit ba213af116c016c9fc8e50751f1638ed7cf94b50)