Merge "adb: fix undefined behavior" am: 1edd61ce5d am: e02e11835d
am: aba7d8a1b8

Change-Id: If64dc5eb602204fbcbbb585209008b808a2584cb