Change-Id: I1689733af6cd8778f017a732dd36ad91bff80ea8 (cherry picked from commit 40bc2c251e00d6d95289fdd9def11f9e1bd9202f)