Change-Id: I1bb48be7d154ef2d513c8f611c52a7c89414737c (cherry picked from commit 3755c3d8bcc3d0f22eb7a775ec7a689feb7e1725)