Change-Id: I484c52087741a8f5ee4da6bc240c9897e3f94bd3 (cherry picked from commit a2862f87369f78a39caf427a924a756f7115e1b5)