Change-Id: If646e1fce6ebe5c39893e435d426d964556c7c84 (cherry picked from commit ee497f6823fa1388629b1fafa3e8471586f5c31c)