Change-Id: Ibe77e8b93466a71d4d0c48ca8f4ff2e00c6e40af (cherry picked from commit ee669788bc86330215f2444b3beb1f3870329c9e)