This reverts commit 443c11e0. Reinstate patch for June 17 KMI update Bug: 233781098 Change-Id: I47ebbc6a1cecc363b97e35c10a5e44d7221caa01