Change-Id: Ie8dd684a7b79b0a322b1f2d17fffb4d58cfe94fc (cherry picked from commit 562e9704f8ed292889f5786d373f9f09cf87ae8a)