Merge "Improve "adb install" diagnostics." am: a16ae8717c am: 66321bc889 am: 3a836e0e70
am: 163c0c956b

Change-Id: Id1ff7b6622c1ac202ec80655b2d45aad18c87c54