This reverts commit b982f17e. Reinstate patch for June 17 KMI update Bug: 233781098 Change-Id: I46ebf0f8598acbc6976380b71f7a26812478bdf7