Change-Id: Iedb4fc325ff1f42677bba474d6d8994a780a7bf8 (cherry picked from commit f9e897228882e4b913ec6ef4f901d873f1b338e1)