Merge "Fix memory leak and failure in test_kstate. Also make test_kstate non-flaky. Change-Id: Ie318042f04b26f08198645f5f0a75f9e6f1b84a4"(cherry picked from commit 33e0886386621d1e5ff4cdd1637a083b86b8ba76)
Change-Id: I780a069639b9ab9128a601b3fa793b9b56734d04
Merge "Merge "Fix memory leak and failure in test_kstate. Also make test_kstate non-flaky. Change-Id: Ie318042f04b26f08198645f5f0a75f9e6f1b84a4"(cherry picked from commit 33e0886386621d1e5ff4cdd1637a083b86b8ba76) Change-Id: I780a069639b9ab9128a601b3fa793b9b56734d04" into R1.10