Merge "Optimization : Do not recurse into unexported Abi." am: 4a67eaddd6 am: 96ea6ef892
am: 9dbacad967

Change-Id: I149e69a8e006c701c603c9fe50a716d0e691df46