This reverts commit 3062974b. Reinstate patch for June 17 KMI update Bug: 233781098 Change-Id: I9880ceb939c24ba294b69f74eed3f342e6b51598