To release any references early Change-Id: Ib4417301e4f02fbc7d9f4d77d78cb827bb481726 (cherry picked from commit b85e007ff1) (cherry picked from commit 130a12a2cc)
b85e007ff1
130a12a2cc