Change-Id: I99ace87980da03bb35a8012cea7218d602a8817a (cherry picked from commit 762a56cc64bc07d57f94e253920534b8e049f238)