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

Change-Id: Ic3dbef96280b52d2869534acbf9abc8df71918ae