(cherry picked from commit 1aedcb86f08affb4265539418d4cde377c4de80c) Change-Id: I6af85ddfafa1fe1577fd43431a08d62e9c2a5a52