Change-Id: Ie3eed0c22f01af228c0507eb131a1041f3fde3a8 (cherry picked from commit 0d728271668dcb85b7764859bf99f701695c5124)