Change-Id: I5f7224f646729cba94505487d00015a8e48443c5 (cherry picked from commit 26bf483bfe089cc6730e1c1da452497feb320520)