Change-Id: I21e05afce3a1ce375df81ee4fd736037c434804a (cherry picked from commit 74297b4a49de7995147e5d26c47cc131fa837668)