Change-Id: I07f77a63aa98087626e45c4e87aa5dcafc0b0b07 (cherry picked from commit d0f237702745c4bfc0297d24f9465f960fb988ed)