Change-Id: I8f8b5d9d27e204615c9380898da86d4d7ae4b132 (cherry picked from commit 0c6e34feec768e9a00aebf54d4b2d9f75773607f)