Change-Id: I9f8e8f621650347f6c2f9e3420edee9eb2f356a4 (cherry picked from commit 3061bfcde53210d2032df3814243498b27a997b7)