Change-Id: I25f0bdaf48e503a3321532fcf84f5389217c3da8 (cherry picked from commit bf9da4391198eb429a1913203766620a08a42aa5)