Change-Id: Idbb2cd250f4f62dc32993e0d3ca3ec5684616baa (cherry picked from commit 3a6bd775500343632bad5f9c1a2bfacd408f7760)