Change-Id: Idd55c79921b8acacc8a8a3258450e476f3abb706
(cherry picked from commit 4cef01147f98451de8acaa90f42a4d4cd4d0af45)