Change-Id: I3a9cef0d416db96d05098dd989ee3fef3b1e9274 (cherry picked from commit cc5e6afa1ba0bef099bcb21a64a36bc2bf7951db)