Merge "Added More Abi information." am: 1345214bfc
am: 1b856be6a0

Change-Id: I8611cadd6ee393b85d25c14dc346e9dbbff3e3d0