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

Change-Id: Ied19f5ab73244e621e97c82f324f1f5f0f36ec07