Change-Id: I22552e793ab0f3acdaa50e916ee81f9977d0f859 (cherry picked from commit 56ef8886f64b4e294840d602850f832b38b5989b)