am 64f83cf8: am 9337d0ac: Merge "Remove non-functional "adb persist"."

* commit '64f83cf8c6856e459d7df17f957f2712f133a4d7':
  Remove non-functional "adb persist".