Change-Id: I7f01d51e825ff206c895e04ac84acd40019ef77e (cherry picked from commit 74e1930b88831afbbe3154cbeed2bb74c6e4fbcf)