Change-Id: Ibf800fe89715f65ca9ada25b4cd31f348944e506 (cherry picked from commit 27a768bfaed52516478887e1d0f8e10d066fd5be)