Merge "Cherry pick from Honeycomb-mr2 Change ID  I6ba2dca8606cdd4608d42f219b115536facf099f IAB docs: fixes and updates"