Requires a parallel change in adb to support the new syntax. Change-Id: Iff30cb247e424b6817af121c018f3c4e40b9f81a