Change-Id: Ie46a5427d29188935427f67e55203c19fcd83335 (cherry picked from commit 6d4a4e785b254a0761a6373ff1376fe64ecf6398)