Change-Id: I1f996cc50c2b4667c18d495b4ca422a40e594cff (cherry picked from commit b0ec7edf1dd69eaf5ec30a1a5f6e8db7ecfa3024)