Change-Id: I94bec5d6818cbf5d2e58589efdba7799cb6e02e7 (cherry picked from commit ace2c424f168d79c5a84fc9a1cc460a5825c5848)