Change-Id: I9ac1f05b93581f5c88cec12291049e77f441cb8b (cherry picked from commit ebe0a67ffc578035510c3f231a085bd8ebe5b787)