Change-Id: I755fe903337d4ff9ec35dae5b9cce638794e1d0f (cherry picked from commit ec2ae3060a807c8754826af2135a68c08b2e4f13)